kirklund commented on a change in pull request #7121:
URL: https://github.com/apache/geode/pull/7121#discussion_r751551154
##########
File path:
geode-junit/src/main/java/org/apache/geode/codeAnalysis/AnalyzeDataSerializablesTestBase.java
##########
@@ -47,18 +46,17 @@
import org.apache.geode.internal.serialization.BufferDataOutputStream;
import org.apache.geode.internal.serialization.KnownVersion;
import org.apache.geode.test.junit.categories.SerializationTest;
-import org.apache.geode.test.junit.rules.ClassAnalysisRule;
/**
* This abstract test class is the basis for all of our
AnalyzeModuleNameSerializables tests.
* Subclasses must provide serialization/deserialization methods.
*
* <p>
- * Most tests should subclass {@link AnalyzeSerializablesJUnitTestBase}
instead of this
+ * Most tests should subclass {@link AnalyzeSerializablesTestBase} instead of
this
Review comment:
Done
##########
File path:
geode-junit/src/main/java/org/apache/geode/codeAnalysis/AnalyzeDataSerializablesTestBase.java
##########
@@ -209,9 +201,10 @@ public void testExcludedClassesExistAndDoNotDeserialize()
throws Exception {
final Object excludedInstance;
try {
excludedInstance = excludedClass.newInstance();
- } catch (InstantiationException | IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException |
NullPointerException e) {
// okay - it's in the excludedClasses.txt file after all
// IllegalAccessException means that the constructor is private.
+ // throw new AssertionError("Unable to instantiate " +
excludedClass.getName(), e);
Review comment:
Done
##########
File path:
geode-junit/src/main/java/org/apache/geode/test/junit/rules/ClassAnalysisRule.java
##########
@@ -95,19 +101,26 @@ private void loadClasses() {
.map(x -> new File(x))
.collect(Collectors.toList());
+ // check for <module>/build/classes/java/**
String gradleBuildDirName =
- Paths.get(getModuleName(), "build", "classes", "java",
"main").toString();
- // System.out.println("gradleBuildDirName is " + gradleBuildDirName);
+ Paths.get(getModuleName(), "build", "classes", "java",
sourceSet).toString();
+
+ // check for <module>/build/classes/test/**
+ String alternateBuildDirName =
+ Paths.get(getModuleName(), "build", "classes", sourceSet).toString();
+
+ // check for <module>/out/production/classes/**
String ideaBuildDirName =
Paths.get(getModuleName(), "out", "production", "classes").toString();
- // System.out.println("ideaBuildDirName is " + ideaBuildDirName);
+
+ // check for <module>/out/production/geode.<module>.<sourceSet>/**
String ideaFQCNBuildDirName =
- Paths.get("out", "production", "geode." + getModuleName() +
".main").toString();
- // System.out.println("idea build path with full package names is " +
ideaFQCNBuildDirName);
+ Paths.get("out", "production", "geode." + getModuleName() + "." +
sourceSet).toString();
Review comment:
Done
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
