You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/09/18 13:05:04 UTC
[cayenne] 03/03: Cgen tests validating actual generation results
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit daac9549791fc9d1e65ead5185c2b0c33257cd38
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Fri Sep 18 16:04:48 2020 +0300
Cgen tests validating actual generation results
---
.../cayenne/gen/ClassGenerationActionTest.java | 31 +++++++++++-----------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
index 7529fad..ef9d5e6 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/ClassGenerationActionTest.java
@@ -33,17 +33,19 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.QueryDescriptor;
import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
public class ClassGenerationActionTest extends CgenCase {
+ @Rule
+ public TemporaryFolder tempFolder = new TemporaryFolder();
+
protected ClassGenerationAction action;
protected Collection<StringWriter> writers;
@@ -287,21 +289,21 @@ public class ClassGenerationActionTest extends CgenCase {
TemplateType templateType = TemplateType.DATAMAP_SUPERCLASS;
- cgenConfiguration.setRelPath("./src/test/resources");
+ cgenConfiguration.setRootPath(tempFolder.getRoot().toPath());
+ cgenConfiguration.setRelPath(".");
action = new ClassGenerationAction(cgenConfiguration);
ObjEntity testEntity1 = new ObjEntity("TEST");
testEntity1.setClassName("TestClass1");
action.context.put(Artifact.SUPER_PACKAGE_KEY, "");
action.context.put(Artifact.SUPER_CLASS_KEY, "TestClass1");
- File outFile = new File("./src/test/resources/TestClass1.java");
+ File outFile = new File(tempFolder.getRoot() + "/TestClass1.java");
assertFalse(outFile.exists());
action.openWriter(templateType);
assertTrue(outFile.exists());
- assertEquals(null, action.openWriter(templateType));
- outFile.delete();
+ assertNull(action.openWriter(templateType));
}
@Test
@@ -309,27 +311,26 @@ public class ClassGenerationActionTest extends CgenCase {
TemplateType templateType = TemplateType.DATAMAP_SINGLE_CLASS;
- cgenConfiguration.setRelPath("./src/test/resources");
+ cgenConfiguration.setRootPath(tempFolder.getRoot().toPath());
+ cgenConfiguration.setRelPath(".");
action = new ClassGenerationAction(cgenConfiguration);
ObjEntity testEntity1 = new ObjEntity("TEST");
testEntity1.setClassName("TestClass1");
action.context.put(Artifact.SUB_PACKAGE_KEY, "");
action.context.put(Artifact.SUB_CLASS_KEY, "TestClass1");
- File outFile = new File("./src/test/resources/TestClass1.java");
+ File outFile = new File(tempFolder.getRoot() + "/TestClass1.java");
assertFalse(outFile.exists());
action.openWriter(templateType);
assertTrue(outFile.exists());
- assertEquals(null, action.openWriter(templateType));
+ assertNull(action.openWriter(templateType));
cgenConfiguration.setMakePairs(false);
- assertEquals(null, action.openWriter(templateType));
+ assertNull(action.openWriter(templateType));
cgenConfiguration.setOverwrite(true);
- assertEquals(null, action.openWriter(templateType));
-
- outFile.delete();
+ assertNull(action.openWriter(templateType));
}
}
\ No newline at end of file