Skip to content

Commit 78bf5df

Browse files
schlichtigschlichtig
authored
Merge pull request #432 from seena-mathew/codegen_testfailure_issue
Code generation plugin test failure issue resolved
2 parents cbd9940 + c56d513 commit 78bf5df

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

‎plugins/de.cognicrypt.codegenerator.tests/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ Bundle-SymbolicName: de.cognicrypt.codegenerator.tests;singleton:=true
55
Bundle-Version: 1.0.0.qualifier
66
Fragment-Host: de.cognicrypt.codegenerator;bundle-version="1.0.0"
77
Require-Bundle: org.eclipse.jdt.launching,
8-
de.cognicrypt.core
8+
de.cognicrypt.core,
9+
org.slf4j.api;bundle-version="1.7.30"
910
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
1011
Bundle-ClassPath: lib/claferchocoig.jar,src/
1112
Export-Package: de.cognicrypt.codegenerator

‎plugins/de.cognicrypt.codegenerator.tests/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,14 @@
1313
<groupId>de.cognicrypt</groupId>
1414
<artifactId>de.cognicrypt.codegenerator.tests</artifactId>
1515
<packaging>eclipse-test-plugin</packaging>
16+
<dependencies>
17+
<dependency>
18+
<groupId>org.slf4j</groupId>
19+
<artifactId>slf4j-api</artifactId>
20+
<version>1.7.30</version>
21+
</dependency>
1622

23+
</dependencies>
1724
<build>
1825
<pluginManagement>
1926
<plugins>

‎plugins/de.cognicrypt.codegenerator.tests/src/de/cognicrypt/codegenerator/generator/test/CodeGenLocationSelectionTest.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public void noSpecificSelection() throws Exception {
4545
ICompilationUnit outputClass = TestUtils.getICompilationUnit(developerProject, Constants.PackageNameAsName,
4646
"Output.java");
4747
assertNotNull(outputClass); // check if Output.java is created
48+
TestUtils.deleteProject(generatedProject.getProject());
4849
}
4950

5051
/**
@@ -86,6 +87,7 @@ public void packageSelection() throws Exception {
8687
ICompilationUnit outputClass = TestUtils.getICompilationUnit(developerProject, Constants.PackageNameAsName,
8788
"Output.java");
8889
assertNotNull(outputClass); // check if Output.java is created
90+
TestUtils.deleteProject(generatedProject.getProject());
8991
}
9092

9193
/**
@@ -120,5 +122,6 @@ public void ownClassSelection() throws Exception {
120122
ICompilationUnit outputClass = TestUtils.getICompilationUnit(developerProject, Constants.PackageNameAsName,
121123
"Output.java");
122124
assertNull(outputClass); // check if Output.java is not created
125+
TestUtils.deleteProject(generatedProject.getProject());
123126
}
124127
}

‎plugins/de.cognicrypt.codegenerator.tests/src/de/cognicrypt/codegenerator/generator/test/CodeGenOthersTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public void noSpecificSelection() throws Exception {
4444
ICompilationUnit outputClass = TestUtils.getICompilationUnit(developerProject, Constants.PackageNameAsName,
4545
"Output.java");
4646
assertNotNull(outputClass); // check if Output.java is created
47+
TestUtils.deleteProject(generatedProject.getProject());
4748
}
4849

4950

@@ -83,6 +84,7 @@ public void packageSelection() throws Exception {
8384
ICompilationUnit outputClass = TestUtils.getICompilationUnit(developerProject, Constants.PackageNameAsName,
8485
"Output.java");
8586
assertNotNull(outputClass); // check if Output.java is created
87+
TestUtils.deleteProject(generatedProject.getProject());
8688
}
8789

8890
// /**

‎plugins/de.cognicrypt.codegenerator.tests/src/de/cognicrypt/codegenerator/generator/test/CrySLCodeGenTest.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ public class CrySLCodeGenTest {
3535
public void generateSymEnc() {
3636
String template = "secretkeyencryption";
3737
try {
38-
IResource targetFile = TestUtils.generateJavaClassInJavaProject(TestUtils.createJavaProject("TestProject_SYMENC"), "testPackage", "Test");
38+
IJavaProject testJavaProject = TestUtils.createJavaProject("TestProject_SYMENC");
39+
IResource targetFile = TestUtils.generateJavaClassInJavaProject(testJavaProject, "testPackage", "Test");
3940
CodeGenerator codeGenerator = new CrySLBasedCodeGenerator(targetFile);
4041
DeveloperProject developerProject = codeGenerator.getDeveloperProject();
4142
CrySLConfiguration chosenConfig = TestUtils.createCrySLConfiguration(template, targetFile, codeGenerator, developerProject);
@@ -53,6 +54,7 @@ public void generateSymEnc() {
5354
assertEquals(4, TestUtils.countStatements(encClassUnit, "generateSessionKey"));
5455
assertEquals(13, TestUtils.countStatements(encClassUnit, "encrypt"));
5556
assertEquals(11, TestUtils.countStatements(encClassUnit, "decrypt"));
57+
TestUtils.deleteProject(testJavaProject.getProject());
5658
}
5759
catch (JavaModelException e) {
5860
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -89,6 +91,7 @@ public void generatePBEnc() {
8991
assertEquals(12, TestUtils.countStatements(encClassUnit, "getKey"));
9092
assertEquals(13, TestUtils.countStatements(encClassUnit, "encrypt"));
9193
assertEquals(11, TestUtils.countStatements(encClassUnit, "decrypt"));
94+
TestUtils.deleteProject(testJavaProject.getProject());
9295
}
9396
catch (JavaModelException e) {
9497
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -125,6 +128,7 @@ public void generatePBEncFiles() {
125128
assertEquals(12, TestUtils.countStatements(encClassUnit, "getKey"));
126129
assertEquals(15, TestUtils.countStatements(encClassUnit, "encrypt"));
127130
assertEquals(13, TestUtils.countStatements(encClassUnit, "decrypt"));
131+
TestUtils.deleteProject(testJavaProject.getProject());
128132
}
129133
catch (JavaModelException e) {
130134
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -161,6 +165,7 @@ public void generatePBEncStrings() {
161165
assertEquals(12, TestUtils.countStatements(encClassUnit, "getKey"));
162166
assertEquals(14, TestUtils.countStatements(encClassUnit, "encrypt"));
163167
assertEquals(12, TestUtils.countStatements(encClassUnit, "decrypt"));
168+
TestUtils.deleteProject(testJavaProject.getProject());
164169
}
165170
catch (JavaModelException e) {
166171
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -199,6 +204,7 @@ public void generateHybridEnc() {
199204
assertEquals(7, TestUtils.countStatements(encClassUnit, "encryptSessionKey"));
200205
assertEquals(13, TestUtils.countStatements(encClassUnit, "encryptData"));
201206
assertEquals(11, TestUtils.countStatements(encClassUnit, "decryptData"));
207+
TestUtils.deleteProject(testJavaProject.getProject());
202208
}
203209
catch (JavaModelException e) {
204210
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -236,6 +242,7 @@ public void generateHybridEncFiles() {
236242
assertEquals(7, TestUtils.countStatements(encClassUnit, "encryptSessionKey"));
237243
assertEquals(15, TestUtils.countStatements(encClassUnit, "encryptData"));
238244
assertEquals(13, TestUtils.countStatements(encClassUnit, "decryptData"));
245+
TestUtils.deleteProject(testJavaProject.getProject());
239246
}
240247
catch (JavaModelException e) {
241248
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -274,6 +281,7 @@ public void generateHybridEncStrings() {
274281
assertEquals(7, TestUtils.countStatements(encClassUnit, "encryptSessionKey"));
275282
assertEquals(14, TestUtils.countStatements(encClassUnit, "encryptData"));
276283
assertEquals(12, TestUtils.countStatements(encClassUnit, "decryptData"));
284+
TestUtils.deleteProject(testJavaProject.getProject());
277285
}
278286
catch (JavaModelException e) {
279287
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -289,7 +297,7 @@ public void generateHybridEncStrings() {
289297

290298
@Test
291299
public void generateSecPwd() {
292-
String template = "securePassword";
300+
String template = "securepassword";
293301
try {
294302
IJavaProject testJavaProject = TestUtils.createJavaProject("TestProject_SecPwd");
295303
IResource targetFile = TestUtils.generateJavaClassInJavaProject(testJavaProject, "testPackage", "Test");
@@ -309,6 +317,7 @@ public void generateSecPwd() {
309317
assertEquals(5, TestUtils.countMethods(encClassUnit));
310318
assertEquals(12, TestUtils.countStatements(encClassUnit, "createPWHash"));
311319
assertEquals(11, TestUtils.countStatements(encClassUnit, "verifyPWHash"));
320+
TestUtils.deleteProject(testJavaProject.getProject());
312321
}
313322
catch (JavaModelException e) {
314323
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -344,6 +353,7 @@ public void generatedigSign() {
344353
assertEquals(5, TestUtils.countStatements(encClassUnit, "getKey"));
345354
assertEquals(8, TestUtils.countStatements(encClassUnit, "sign"));
346355
// assertEquals(14, TestUtils.countStatements(encClassUnit, "vfy"));
356+
TestUtils.deleteProject(testJavaProject.getProject());
347357
}
348358
catch (JavaModelException e) {
349359
Activator.getDefault().logError(e, "Could not create Java class in test project.");
@@ -378,6 +388,7 @@ public void generateStringHasher() {
378388
assertEquals(2, TestUtils.countMethods(encClassUnit));
379389
assertEquals(5, TestUtils.countStatements(encClassUnit, "createHash"));
380390
assertEquals(5, TestUtils.countStatements(encClassUnit, "verifyHash"));
391+
TestUtils.deleteProject(testJavaProject.getProject());
381392
}
382393
catch (JavaModelException e) {
383394
Activator.getDefault().logError(e, "Could not create Java class in test project.");

0 commit comments

Comments
 (0)