Permalink
Browse files

Merge branch 'release/22.0.4-BETA'

  • Loading branch information...
2 parents 39e61fb + bd87eca commit 20fa04359e2f8fdafa5c907cfea02ee0e55053e0 Jeff Lai committed Jul 29, 2011
Showing with 251 additions and 372 deletions.
  1. +1 −1 build-tools/pom.xml
  2. +1 −1 codegen/pom.xml
  3. +1 −1 connector/pom.xml
  4. +1 −1 javasdk-test/codegen-test/pom.xml
  5. +1 −1 javasdk-test/codegen-test/src/test/java/com/force/sdk/codegen/CreatedClassCRUDFTest.java
  6. +1 −1 javasdk-test/connector-test/pom.xml
  7. +1 −1 ...k-test/connector-test/src/test/java/com/force/sdk/connector/ForceServiceConnectorLoggingTest.java
  8. +1 −1 javasdk-test/jpa-test-beanvalidation/pom.xml
  9. +1 −1 ...st/jpa-test-beanvalidation/src/test/java/com/force/sdk/jpa/beanvalidation/BeanValidationTest.java
  10. +1 −1 ...-test-beanvalidation/src/test/java/com/force/sdk/jpa/beanvalidation/SpringBeanValidationTest.java
  11. +1 −1 javasdk-test/jpa-test-connection/pom.xml
  12. +1 −1 javasdk-test/jpa-test-query/pom.xml
  13. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/FetchTypeFTest.java
  14. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/NegativeJPAQueryFTest.java
  15. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/QueryAggregateFunctionsTest.java
  16. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/QueryDateTest.java
  17. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/QueryOrderByFTest.java
  18. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/QueryRelationshipTest.java
  19. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/QueryReturnTypeFTest.java
  20. +1 −1 javasdk-test/jpa-test-query/src/test/java/com/force/sdk/jpa/query/WhereHavingOperatorFTest.java
  21. +1 −1 javasdk-test/jpa-test-schema/pom.xml
  22. +1 −1 javasdk-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/SchemaBaseTest.java
  23. +1 −1 javasdk-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/SchemaCreateTest.java
  24. +13 −3 javasdk-test/jpa-test-schema/src/test/java/com/force/sdk/jpa/schema/SchemaTest.java
  25. +2 −2 javasdk-test/jpa-test/pom.xml
  26. +2 −2 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/BasicCRUDTest.java
  27. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/BasicTransactionTest.java
  28. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/CallbackMethodTest.java
  29. +2 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/CascadeCRUDTest.java
  30. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/ConstructorExpressionTest.java
  31. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/DatatypesBaseTest.java
  32. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/DeleteBulkTest.java
  33. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/EmbeddedCRUDTest.java
  34. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/JPAMappingTest.java
  35. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/MaxFieldLengthExceptionTest.java
  36. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/MergeTest.java
  37. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/NegativeCRUDTest.java
  38. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/NegativeDetachPersistTest.java
  39. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/OptimisticTxTestMT.java
  40. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/PersistenceContextLifetimeTest.java
  41. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/QueryJoinTest.java
  42. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/SchemaLoadInvocationFTest.java
  43. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/SchemaMetaDataTest.java
  44. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/SerializedAttachTest.java
  45. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/SpringBasicCRUDTest.java
  46. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/SpringCreateTest.java
  47. +1 −1 javasdk-test/jpa-test/src/test/java/com/force/sdk/jpa/SubQueryTest.java
  48. +2 −16 javasdk-test/mock-oauth-server/pom.xml
  49. +2 −17 javasdk-test/oauth-app/pom.xml
  50. +12 −10 javasdk-test/oauth-app/src/main/java/com/force/servlets/ProjectList.java
  51. +2 −2 javasdk-test/oauth-integration-test/pom.xml
  52. +1 −1 javasdk-test/oauth-integration-test/src/test/java/com/force/sdk/oauth/mock/LoginEndToEndTest.java
  53. +1 −1 javasdk-test/oauth-integration-test/testng-mock.xml
  54. +1 −1 javasdk-test/oauth-test/pom.xml
  55. +34 −34 javasdk-test/oauth-test/src/test/java/com/force/sdk/oauth/AuthFilterCookieManagementTest.java
  56. +9 −23 javasdk-test/oauth-test/src/test/java/com/force/sdk/oauth/BaseOAuthTest.java
  57. +13 −16 javasdk-test/oauth-test/src/test/java/com/force/sdk/oauth/BasicAuthFilterTest.java
  58. +6 −6 ...-test/oauth-test/src/test/java/com/force/sdk/oauth/connector/NegativeForceOAuthConnectorTest.java
  59. +1 −1 javasdk-test/oauth-test/src/test/java/com/force/sdk/oauth/store/AESUtilTest.java
  60. +1 −6 javasdk-test/oauth-test/src/test/resources/funcconnoauthinfo.properties
  61. +1 −1 javasdk-test/pom.xml
  62. +1 −1 javasdk-test/qa-utils/pom.xml
  63. +0 −75 javasdk-test/qa-utils/src/main/java/com/force/sdk/qa/util/BaseSecurityEndToEndTest.java
  64. +1 −1 javasdk-test/qa-utils/src/main/java/com/force/sdk/qa/util/{ → integration}/BaseContainerTest.java
  65. +4 −1 ...st/qa-utils/src/main/java/com/force/sdk/qa/util/{ → integration}/BaseSecurityIntegrationTest.java
  66. +6 −5 javasdk-test/qa-utils/src/main/java/com/force/sdk/qa/util/{ → jpa}/BaseJPAFTest.java
  67. +3 −1 ...dk-test/qa-utils/src/main/java/com/force/sdk/qa/util/{ → jpa}/BaseMultiEntityManagerJPAFTest.java
  68. +3 −2 ...qa-utils/src/main/java/com/force/sdk/qa/util/{ → jpa}/BaseTransactionalSpringContextJPAFTest.java
  69. +1 −1 javasdk-test/qa-utils/src/main/java/com/force/sdk/qa/util/{ → jpa}/EntityGenerator.java
  70. +8 −25 ...est/qa-utils/src/main/java/com/force/sdk/qa/util/{SfdcTestingUtil.java → jpa/SfdcSchemaUtil.java}
  71. +2 −2 javasdk-test/qa-utils/src/main/java/com/force/sdk/qa/{ → util}/listener/TestTypeListener.java
  72. +1 −1 ...sdk-test/qa-utils/src/main/java/com/force/sdk/qa/util/{ → logging}/ForceLogAppenderValidator.java
  73. +1 −1 javasdk-test/qa-utils/src/main/java/com/force/sdk/qa/util/{ → logging}/MockAppender.java
  74. +3 −11 javasdk-test/qa-utils/src/main/resources/force-sdk-test.properties
  75. +1 −1 javasdk-test/qa-utils/src/main/resources/log4j.xml
  76. +2 −17 javasdk-test/springsecurity-app/pom.xml
  77. +2 −2 javasdk-test/springsecurity-integration-test/pom.xml
  78. +2 −1 ...curity-integration-test/src/test/java/com/force/sdk/springsecurity/endtoend/BaseEndToEndTest.java
  79. +2 −1 ...curity-integration-test/src/test/java/com/force/sdk/springsecurity/mock/LoginRedirectionTest.java
  80. +1 −1 javasdk-test/springsecurity-integration-test/testng-endtoend.xml
  81. +1 −1 javasdk-test/springsecurity-integration-test/testng-mock.xml
  82. +1 −1 javasdk-test/springsecurity-test/pom.xml
  83. +1 −1 jpa/pom.xml
  84. +1 −1 jpa/src/test/java/com/force/sdk/jpa/entities/Paper.java
  85. +1 −1 jpa/src/test/java/com/force/sdk/jpa/entities/Rock.java
  86. +1 −1 jpa/src/test/java/com/force/sdk/jpa/entities/Scissors.java
  87. +2 −2 jpa/src/test/java/com/force/sdk/jpa/query/BasicJPAQueryJoinTest.java
  88. +1 −1 oauth/pom.xml
  89. +10 −8 oauth/src/main/java/com/force/sdk/oauth/connector/ForceOAuthConnector.java
  90. +1 −5 oauth/src/main/java/com/force/sdk/oauth/context/SecurityContextServiceImpl.java
  91. +32 −0 oauth/src/main/java/com/force/sdk/oauth/context/SecurityContextUtil.java
  92. +2 −4 oauth/src/main/java/com/force/sdk/oauth/context/store/SecurityContextCookieStore.java
  93. +4 −9 pom.xml
  94. +1 −1 springsecurity/pom.xml
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
View
@@ -4,7 +4,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -8,7 +8,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<build>
@@ -47,8 +47,8 @@
import com.force.sdk.codegen.entities.NewCustomObject;
import com.force.sdk.jpa.model.BaseForceObject;
import com.force.sdk.jpa.model.Owner;
-import com.force.sdk.qa.util.BaseMultiEntityManagerJPAFTest;
import com.force.sdk.qa.util.TestContext;
+import com.force.sdk.qa.util.jpa.BaseMultiEntityManagerJPAFTest;
/**
* Tests that created JPA Java classes
@@ -9,7 +9,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<build>
@@ -36,7 +36,7 @@
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.force.sdk.qa.util.MockAppender;
+import com.force.sdk.qa.util.logging.MockAppender;
import com.sforce.async.AsyncApiException;
import com.sforce.ws.ConnectionException;
@@ -9,7 +9,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<build>
@@ -33,7 +33,7 @@
import org.testng.annotations.BeforeClass;
import com.force.sdk.jpa.beanvalidation.entities.BeanValidationEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
*
@@ -34,7 +34,7 @@
import org.testng.Assert;
import com.force.sdk.jpa.beanvalidation.entities.BeanValidationEntity;
-import com.force.sdk.qa.util.BaseTransactionalSpringContextJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseTransactionalSpringContextJPAFTest;
/**
*
@@ -8,7 +8,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<build>
@@ -8,7 +8,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<build>
@@ -34,7 +34,7 @@
import org.testng.annotations.*;
import com.force.sdk.jpa.query.entities.FetchTypeFTestEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.google.common.collect.Lists;
/**
@@ -33,7 +33,7 @@
import org.testng.annotations.Test;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
* Negative ftests for Force.com JPA queries.
@@ -38,7 +38,7 @@
import com.force.sdk.jpa.query.entities.DataTypesFTestEntity;
import com.force.sdk.jpa.query.entities.DataTypesFTestEntity.PickValues;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
*
@@ -34,7 +34,7 @@
import org.testng.annotations.*;
import com.force.sdk.jpa.query.entities.date.DateTestEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.google.common.collect.Sets;
/**
@@ -33,7 +33,7 @@
import org.testng.annotations.*;
import com.force.sdk.jpa.query.entities.DataTypesFTestEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.google.common.collect.Lists;
/**
@@ -36,7 +36,7 @@
import com.force.sdk.jpa.query.entities.relationship.ChildRelationshipEntity;
import com.force.sdk.jpa.query.entities.relationship.ParentRelationshipEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
*
@@ -37,7 +37,7 @@
import com.force.sdk.jpa.query.entities.DataTypesFTestEntity;
import com.force.sdk.jpa.query.entities.DataTypesFTestEntity.PickValues;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.google.inject.internal.Lists;
/**
@@ -35,7 +35,7 @@
import com.force.sdk.jpa.query.entities.QueryFTestEntity;
import com.force.sdk.jpa.query.entities.QueryFTestEntity.PickValues;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.google.inject.internal.Lists;
/**
@@ -8,7 +8,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
<build>
@@ -33,9 +33,9 @@
import com.force.sdk.connector.ForceConnectorConfig;
import com.force.sdk.connector.ForceServiceConnector;
-import com.force.sdk.qa.util.BaseJPAFTest;
import com.force.sdk.qa.util.TestContext;
import com.force.sdk.qa.util.UserInfo;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.sforce.ws.ConnectionException;
/**
@@ -35,7 +35,7 @@
import com.force.sdk.jpa.schema.entities.ExistingCustomObjectExtension1;
import com.force.sdk.jpa.schema.entities.UserCustomFields;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.sforce.soap.partner.fault.InvalidFieldFault;
/**
@@ -42,12 +42,14 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import com.force.sdk.connector.ForceConnectorConfig;
+import com.force.sdk.connector.ForceServiceConnector;
import com.force.sdk.jpa.schema.entities.ExistingCustomObject;
import com.force.sdk.jpa.schema.entities.StandardFieldLinkingEntity;
-import com.force.sdk.qa.util.SfdcTestingUtil;
import com.force.sdk.qa.util.TestContext;
import com.sforce.soap.partner.DescribeSObjectResult;
import com.sforce.soap.partner.PartnerConnection;
+import com.sforce.ws.ConnectionException;
/**
*
@@ -384,7 +386,7 @@ public PrecisionScale(int precision, int scale) {
* Verifies that fields are correct in the underlying salesforce custom object.
*/
private void verifyFieldsOnSObject(String sObject, String[] expectedFieldNames) throws Exception {
- PartnerConnection conn = SfdcTestingUtil.getPartnerConnection(TestContext.get().getUserInfo());
+ PartnerConnection conn = getPartnerConnection();
String ns = getNamespaceFromCtx();
if (ns != null && ns != "") {
sObject = ns + NAME_SEPARATOR + sObject;
@@ -415,7 +417,7 @@ private void verifyFieldsOnSObject(String sObject, String[] expectedFieldNames)
*/
private void verifyFieldPrecisions(String sObject,
Map<String, PrecisionScale> expectedFieldMetadata) throws Exception {
- PartnerConnection conn = SfdcTestingUtil.getPartnerConnection(TestContext.get().getUserInfo());
+ PartnerConnection conn = getPartnerConnection();
DescribeSObjectResult describeSObjectResult = conn.describeSObject(sObject);
com.sforce.soap.partner.Field[] fields = describeSObjectResult.getFields();
@@ -433,4 +435,12 @@ private void verifyFieldPrecisions(String sObject,
}
}
+ private PartnerConnection getPartnerConnection() throws ConnectionException {
+ ForceConnectorConfig config = new ForceConnectorConfig();
+ config.setAuthEndpoint(TestContext.get().getUserInfo().getServerEndpoint());
+ config.setUsername(TestContext.get().getUserInfo().getUserName());
+ config.setPassword(TestContext.get().getUserInfo().getPassword());
+ return new ForceServiceConnector(config).getConnection();
+ }
+
}
@@ -8,7 +8,7 @@
<parent>
<groupId>com.force.sdk</groupId>
<artifactId>force-sdk-test</artifactId>
- <version>22.0.3-BETA</version>
+ <version>22.0.4-BETA</version>
</parent>
@@ -61,7 +61,7 @@
</executions>
<configuration>
<includeProjectDependencies>true</includeProjectDependencies>
- <mainClass>com.force.sdk.qa.util.EntityGenerator</mainClass>
+ <mainClass>com.force.sdk.qa.util.jpa.EntityGenerator</mainClass>
<arguments>
<argument>${basedir}/src/test/java/com/force/sdk/jpa/entities/generated</argument>
<argument>26</argument>
@@ -37,9 +37,9 @@
import org.testng.annotations.Test;
import com.force.sdk.jpa.entities.*;
-import com.force.sdk.qa.util.BaseMultiEntityManagerJPAFTest;
-import com.force.sdk.qa.util.ForceLogAppenderValidator;
import com.force.sdk.qa.util.TestContext;
+import com.force.sdk.qa.util.jpa.BaseMultiEntityManagerJPAFTest;
+import com.force.sdk.qa.util.logging.ForceLogAppenderValidator;
/**
*
@@ -32,7 +32,7 @@
import org.testng.annotations.Test;
import com.force.sdk.jpa.entities.AccountEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
* Tests for simple transactional behavior.
@@ -37,8 +37,8 @@
import org.testng.annotations.Test;
import com.force.sdk.jpa.entities.callback.*;
-import com.force.sdk.qa.util.BaseJPAFTest;
import com.force.sdk.qa.util.TestContext;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
* Tests for callback methods on jpa entities.
@@ -27,7 +27,8 @@
package com.force.sdk.jpa;
import com.force.sdk.jpa.entities.cascade.*;
-import com.force.sdk.qa.util.BaseMultiEntityManagerJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseMultiEntityManagerJPAFTest;
+
import org.testng.Assert;
import org.testng.annotations.Test;
@@ -35,7 +35,7 @@
import com.force.sdk.jpa.JPATestUtils.Digit;
import com.force.sdk.jpa.entities.*;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
*
@@ -37,7 +37,7 @@
import com.force.sdk.jpa.JPATestUtils.Digit;
import com.force.sdk.jpa.entities.ParentTestEntity;
import com.force.sdk.jpa.entities.TestEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
*
@@ -36,7 +36,7 @@
import com.force.sdk.jpa.entities.*;
import com.force.sdk.jpa.entities.FolderEntity.FolderType;
import com.force.sdk.jpa.query.QueryHints;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
import com.sforce.ws.ConnectionException;
/**
@@ -37,7 +37,7 @@
import com.force.sdk.jpa.sample.*;
import com.force.sdk.jpa.sample.PhoneNumber.Phonetype;
-import com.force.sdk.qa.util.BaseMultiEntityManagerJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseMultiEntityManagerJPAFTest;
/**
*
@@ -34,7 +34,7 @@
import org.testng.annotations.Test;
import com.force.sdk.jpa.entities.AccountMapped2ndTime;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
*
@@ -32,7 +32,7 @@
import org.testng.annotations.Test;
import com.force.sdk.jpa.entities.TestEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
*
@@ -38,7 +38,7 @@
import com.force.sdk.jpa.entities.PersonEntity;
import com.force.sdk.jpa.entities.PhoneEntity;
import com.force.sdk.jpa.query.QueryHints;
-import com.force.sdk.qa.util.BaseMultiEntityManagerJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseMultiEntityManagerJPAFTest;
/**
* This class tests:-
@@ -36,7 +36,7 @@
import org.testng.annotations.Test;
import com.force.sdk.jpa.entities.*;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
* Negative tests for JPA CRUD operations.
@@ -35,7 +35,7 @@
import org.testng.annotations.Test;
import com.force.sdk.jpa.entities.AccountEntity;
-import com.force.sdk.qa.util.BaseJPAFTest;
+import com.force.sdk.qa.util.jpa.BaseJPAFTest;
/**
* Testing the persistence of detached entities.
Oops, something went wrong.

0 comments on commit 20fa043

Please sign in to comment.