Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove cdr version from Tests [19976] #109

Merged
merged 1 commit into from
Nov 21, 2023
Merged

Remove cdr version from Tests [19976] #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/it/java/com/eprosima/integration/Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,10 @@ public boolean generate(
String generatorName,
String inputPath,
String exampleArch,
String cdr_version,
boolean testFlag)
{
String program = "java -jar " + generatorName + ".jar";
String flags = " -cdr " + cdr_version + " -replace -example" + " " + exampleArch + (testFlag ? " -test" : "");
String flags = " -replace -example" + " " + exampleArch + (testFlag ? " -test" : "");
String output = " -d " + outputPath;

String idlPath = " " + inputPath + "/" + idl + ".idl";
Expand All @@ -63,11 +62,10 @@ public boolean generate(
public boolean generate(
String generatorName,
String inputPath,
String cdr_version,
boolean testFlag)
{
String program = "java -jar " + generatorName + ".jar";
String flags = " -cdr " + cdr_version + " -replace -example" + (testFlag ? " -test" : "");
String flags = " -replace -example" + (testFlag ? " -test" : "");
String output = " -d " + outputPath;

String idlPath = " " + inputPath + "/" + idl + ".idl";
Expand Down
9 changes: 2 additions & 7 deletions src/it/java/com/eprosima/integration/TestManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,12 @@ public int getValue()
private String exampleArch;
private List<String> cMakeArgs;
private boolean errorOutputOnly;
private String cdr_version_;

public TestManager(
TestLevel level,
String generatorName,
String inputPath,
String outputPath,
String cdr_version,
List<String> list_tests,
List<String> blacklist_tests)
{
Expand All @@ -59,7 +57,6 @@ public TestManager(
this.exampleArch = null;
this.cMakeArgs = new ArrayList<String>();
this.errorOutputOnly = true;
this.cdr_version_ = cdr_version;
}

public TestManager(
Expand All @@ -68,7 +65,6 @@ public TestManager(
String inputPath,
String outputPath,
String exampleArch,
String cdr_version,
List<String> list_tests,
List<String> blacklist_tests)
{
Expand All @@ -81,7 +77,6 @@ public TestManager(
this.exampleArch = exampleArch;
this.cMakeArgs = new ArrayList<String>();
this.errorOutputOnly = true;
this.cdr_version_ = cdr_version;
}

public void processIDLsDirectory(
Expand Down Expand Up @@ -164,9 +159,9 @@ public boolean generate(Test test)

if (exampleArch == null)
{
return printlnStatus(test.generate(generatorName, inputPath, cdr_version_, level == TestLevel.RUN));
return printlnStatus(test.generate(generatorName, inputPath, level == TestLevel.RUN));
} else {
return printlnStatus(test.generate(generatorName, inputPath, exampleArch, cdr_version_, level == TestLevel.RUN));
return printlnStatus(test.generate(generatorName, inputPath, exampleArch, level == TestLevel.RUN));
}
}

Expand Down