Author: mikedd
Date: Thu Jul 22 16:44:32 2010
New Revision: 966737
URL: http://svn.apache.org/viewvc?rev=966737&view=rev
Log:
Exclude 'invalid' entities when running enhancer test
Added:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
(with props)
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
Added:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java?rev=966737&view=auto
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
(added)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
Thu Jul 22 16:44:32 2010
@@ -0,0 +1,61 @@
+/*
+ * 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.openjpa.enhance;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import org.apache.openjpa.meta.MetaDataRepository;
+
+/**
+ * A simple metadata repository wrapper which removes selected types
+ * from the set of names returned by getPersistentTypeNames.
+ * This MDR provides a simple method to skip extraneous and more important,
+ * purposefully erroneous classes during enhancement. This
+ * especially useful in the case where all pu's are enhanced generically,
+ * automatically picking up all entities in the classpath.
+ */
+...@suppresswarnings("serial")
+public class RestrictedMetaDataRepository extends MetaDataRepository {
+
+ private Set<String> _excludedTypes = new HashSet<String>();
+
+ public String getExcludedTypes() {
+ return _excludedTypes.toString();
+ }
+
+ public void setExcludedTypes(String types) {
+ StringTokenizer strTok = new StringTokenizer(types,";");
+ while (strTok.hasMoreTokens()) {
+ _excludedTypes.add(strTok.nextToken());
+ }
+ }
+
+ public Set<String> getPersistentTypeNames(boolean devpath, ClassLoader
envLoader) {
+ Set<String> types = super.getPersistentTypeNames(devpath, envLoader);
+ String[] typeArray = types.toArray(new String[types.size()]);
+ for (String type : typeArray) {
+ if(_excludedTypes.contains(type)) {
+ types.remove(type);
+ }
+ }
+ return types;
+ }
+}
Propchange:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/RestrictedMetaDataRepository.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java?rev=966737&r1=966736&r2=966737&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
(original)
+++
openjpa/branches/1.3.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/enhance/TestEnhancementWithMultiplePUs.java
Thu Jul 22 16:44:32 2010
@@ -31,6 +31,8 @@ import org.apache.openjpa.lib.util.Bytec
import org.apache.openjpa.lib.util.J2DoPrivHelper;
import org.apache.openjpa.lib.util.Options;
import org.apache.openjpa.meta.MetaDataRepository;
+import
org.apache.openjpa.persistence.jdbc.annotations.UnenhancedInappropriateTransient;
+import org.apache.openjpa.persistence.jdbc.annotations.UnenhancedMixedAccess;
import org.apache.openjpa.persistence.test.PersistenceTestCase;
import serp.bytecode.BCClass;
import serp.bytecode.Project;
@@ -139,6 +141,15 @@ public class TestEnhancementWithMultiple
};
opts = new Options();
+ // Use a restricted mdr. This mdr will not hand out metadata for
excluded
+ // types. These are types that have known issues and should not be
enhanced.
+ // This test tries to enhance all persistent types in the classpath
and that
+ // can be problematic for tests which include entities that this test
should
+ // not attempt to enhance.
+ opts.setProperty("MetaDataRepository",
+
"org.apache.openjpa.enhance.RestrictedMetaDataRepository(ExcludedTypes=" +
+ UnenhancedMixedAccess.class.getCanonicalName() + ";" +
+ UnenhancedInappropriateTransient.class.getCanonicalName() + ")");
opts.put(PCEnhancer.class.getName() + "#bytecodeWriter", writer);
PCEnhancer.run(null, opts);
