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

Skip test case dataset #60 #215

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Skip test case dataset #60 #215

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
20 changes: 20 additions & 0 deletions src/main/java/com/xceptance/neodymium/module/statement/testdata/SkipDataSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.xceptance.neodymium.module.statement.testdata;

import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.TYPE;
import static java.lang.annotation.RetentionPolicy.RUNTIME;

import java.lang.annotation.Retention;
import java.lang.annotation.Target;

@Retention(RUNTIME)
@Target(
{
TYPE, METHOD
})
public @interface SkipDataSet
{
int value() default 0;

String id() default "";
}
69 changes: 68 additions & 1 deletion src/main/java/com/xceptance/neodymium/module/statement/testdata/TestdataStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;

import org.apache.commons.lang3.StringUtils;
import org.junit.runners.model.FrameworkMethod;
Expand Down Expand Up @@ -182,6 +183,28 @@ private List<Object> processOverrides(TestClass testClass, FrameworkMethod metho

// at this point neither the class nor the method could have data sets suppressed
List<DataSet> classDataSetAnnotations = getAnnotations(testClass.getJavaClass(), DataSet.class);
List<SkipDataSet> classSkipDataSetAnnotations = getAnnotations(testClass.getJavaClass(), SkipDataSet.class);
List<SkipDataSet> methodSkipDataSetAnnotations = getAnnotations(method.getMethod(), SkipDataSet.class);

// if class annotation states that the data set should be skipped but the method annotation explicitly declares
// that the data set should be used for the execution, the method annotation has a priority
if (!methodDataSetAnnotations.isEmpty())
{
List<SkipDataSet> classSkipDataSetAnnotationsAdjusted = new LinkedList<>();

for (SkipDataSet skipDataSet : classSkipDataSetAnnotations)
{
for (DataSet methodDataSet : methodDataSetAnnotations)
{
if (!(skipDataSet.id().equals(methodDataSet.id()) || skipDataSet.value() == methodDataSet.value()))
{
classSkipDataSetAnnotationsAdjusted.add(skipDataSet);
}
}
}
classSkipDataSetAnnotations = classSkipDataSetAnnotationsAdjusted;
}

if (!methodDataSetAnnotations.isEmpty())
{
dataSetAnnotations = methodDataSetAnnotations;
Expand Down Expand Up @@ -273,7 +296,51 @@ else if (!classDataSetAnnotations.isEmpty())
// choose the random data sets [0,randomSetAmount[
fixedIterations = fixedIterations.subList(0, randomSetAmount);
}
return fixedIterations;

List<SkipDataSet> skipDataSetAnnotations = new LinkedList<>();
if (!methodSkipDataSetAnnotations.isEmpty())
{
skipDataSetAnnotations.addAll(methodSkipDataSetAnnotations);
}
else if (!classSkipDataSetAnnotations.isEmpty())
{
skipDataSetAnnotations.addAll(classSkipDataSetAnnotations);
}

return applyFilterToSkipIterations(skipDataSetAnnotations, fixedIterations);
}

private List<Object> applyFilterToSkipIterations(List<SkipDataSet> skipDataSetAnnotations, List<Object> iterations)
{

class DataObject
{
int index;

String id;

DataObject(int index, String id)
{
this.index = index;
this.id = id;
}

@Override
public boolean equals(Object object)
{
DataObject another = (DataObject) object;
return another.index == this.index || (another.id != null && another.id.equals(this.id));
}
}
List<DataObject> skipDataSetObjects = skipDataSetAnnotations.stream().map(dataSet -> new DataObject(dataSet.value(), dataSet.id()))
.collect(Collectors.toList());

return iterations.stream()
.filter(iteration -> !skipDataSetObjects.contains(new DataObject(((TestdataStatementData) iteration).getIndex()
+ 1, (((TestdataStatementData) iteration).getDataSet() != null ? ((TestdataStatementData) iteration).getDataSet()
.get(TEST_ID)
: null))))
.collect(Collectors.toList());
}

@Override
Expand Down
41 changes: 41 additions & 0 deletions .../xceptance/neodymium/testclasses/data/override/classonly/ClassSkipDataSetAnnotations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.xceptance.neodymium.testclasses.data.override.classonly;

import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import com.xceptance.neodymium.NeodymiumRunner;
import com.xceptance.neodymium.module.statement.testdata.DataSet;
import com.xceptance.neodymium.module.statement.testdata.SkipDataSet;
import com.xceptance.neodymium.util.DataUtils;

@RunWith(NeodymiumRunner.class)
@SkipDataSet(1)
public class ClassSkipDataSetAnnotations
{
@Test
public void testSomething1()
{
String key = DataUtils.asString("key1");
Assert.assertTrue("Test should only run for 2 and 3 data set", key.equals("val2") || key.equals("val3"));
// should run 2 and 3
}

@Test
@DataSet(1)
public void testSomething2()
{
String key = DataUtils.asString("key1");
Assert.assertTrue("Test should only run for 1 data set", key.equals("val1"));
// should run 1 ???
}

@Test
@DataSet(2)
public void testSomething3()
{
String key = DataUtils.asString("key1");
Assert.assertTrue("Test should only run for 2 data set", key.equals("val2"));
// should run 2
}
}
33 changes: 33 additions & 0 deletions ...ceptance/neodymium/testclasses/data/override/methodonly/MethodSkipDataSetAnnotations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
package com.xceptance.neodymium.testclasses.data.override.methodonly;

import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import com.xceptance.neodymium.NeodymiumRunner;
import com.xceptance.neodymium.module.statement.testdata.DataSet;
import com.xceptance.neodymium.module.statement.testdata.SkipDataSet;
import com.xceptance.neodymium.util.DataUtils;

@RunWith(NeodymiumRunner.class)
public class MethodSkipDataSetAnnotations
{
@Test
@SkipDataSet(2)
public void testSomething4()
{
String key = DataUtils.asString("key1");
Assert.assertTrue("Test should only run for 1 and 3 data set", key.equals("val1") || key.equals("val3"));
// should run 1 and 3
}

@Test
@DataSet(2)
@SkipDataSet(2)
public void testSomething5()
{
String key = DataUtils.asString("key1", null);
Assert.assertNull("Test should run with supressed data sets", key);
// should run without data set (same as SuppressDataSets) ???
}
}
34 changes: 34 additions & 0 deletions .../com/xceptance/neodymium/testclasses/data/override/mixed/MixedSkipDataSetAnnotations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.xceptance.neodymium.testclasses.data.override.mixed;

import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;

import com.xceptance.neodymium.NeodymiumRunner;
import com.xceptance.neodymium.module.statement.testdata.DataSet;
import com.xceptance.neodymium.module.statement.testdata.SkipDataSet;
import com.xceptance.neodymium.util.DataUtils;

@RunWith(NeodymiumRunner.class)
@SkipDataSet(1)
public class MixedSkipDataSetAnnotations
{
@Test
@SkipDataSet(2)
public void testSomething4()
{
String key = DataUtils.asString("key1");
Assert.assertTrue("Test should only run for 1 and 3 data set", key.equals("val1") || key.equals("val3"));
// should run 1 and 3
}

@Test
@DataSet(2)
@SkipDataSet(2)
public void testSomething5()
{
String key = DataUtils.asString("key1", null);
Assert.assertNull("Test should run with supressed data sets", key);
// should run without data set (same as SuppressDataSets) ???
}
}
46 changes: 46 additions & 0 deletions src/test/java/com/xceptance/neodymium/tests/TestDataStatementTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.xceptance.neodymium.testclasses.data.override.classonly.ClassMultipleSameDataSet;
import com.xceptance.neodymium.testclasses.data.override.classonly.ClassRandomDataSets;
import com.xceptance.neodymium.testclasses.data.override.classonly.ClassRandomDataSetsFromRange;
import com.xceptance.neodymium.testclasses.data.override.classonly.ClassSkipDataSetAnnotations;
import com.xceptance.neodymium.testclasses.data.override.methodonly.MethodDefaultEmptyDataSets;
import com.xceptance.neodymium.testclasses.data.override.methodonly.MethodDefaultNoDataSets;
import com.xceptance.neodymium.testclasses.data.override.methodonly.MethodDefaultOneDataSet;
Expand All @@ -27,10 +28,12 @@
import com.xceptance.neodymium.testclasses.data.override.methodonly.MethodMultipleSameDataSet;
import com.xceptance.neodymium.testclasses.data.override.methodonly.MethodRandomDataSets;
import com.xceptance.neodymium.testclasses.data.override.methodonly.MethodRandomDataSetsFromRange;
import com.xceptance.neodymium.testclasses.data.override.methodonly.MethodSkipDataSetAnnotations;
import com.xceptance.neodymium.testclasses.data.override.mixed.ClassWithoutTwoMethodsOneForced;
import com.xceptance.neodymium.testclasses.data.override.mixed.ForceOfNoneDataSets;
import com.xceptance.neodymium.testclasses.data.override.mixed.MixRandomAndValueDataSets;
import com.xceptance.neodymium.testclasses.data.override.mixed.MixRandomDataSetsFromRange;
import com.xceptance.neodymium.testclasses.data.override.mixed.MixedSkipDataSetAnnotations;
import com.xceptance.neodymium.testclasses.data.override.mixed.OneDataSetTwoMethodsOneWithout;
import com.xceptance.neodymium.testclasses.data.override.mixed.OnlyImplicitOneDataSet;
import com.xceptance.neodymium.testclasses.data.override.mixed.OverrideClassRandomDataSetsOnMethodLevel;
Expand Down Expand Up @@ -452,4 +455,47 @@ public void testRandomDataSetsException()
checkFail(result, 1, 0, 1,
"java.lang.IllegalArgumentException: Method 'test' is marked to be run with 4 random data sets, but there are only 2 available");
}

@Test
public void testClassSkipDataSetsAnnotationsTest() throws Throwable
{
String[] expected = new String[]
{
"testSomething1 :: Data set 2 / 3",
"testSomething3 :: Data set 2 / 3",
"testSomething1 :: Data set 3 / 3",
"testSomething2 :: Data set 1 / 3",
};
checkDescription(ClassSkipDataSetAnnotations.class, expected);
Result result = JUnitCore.runClasses(ClassSkipDataSetAnnotations.class);
checkPass(result, 4, 0);
}

@Test
public void testMethodSkipDataSetsAnnotationsTest() throws Throwable
{
String[] expected = new String[]
{
"testSomething4 :: Data set 1 / 3",
"testSomething4 :: Data set 3 / 3",
"testSomething5",
};
checkDescription(MethodSkipDataSetAnnotations.class, expected);
Result result = JUnitCore.runClasses(MethodSkipDataSetAnnotations.class);
checkPass(result, 3, 0);
}

@Test
public void testMixedSkipDataSetsAnnotationsTest() throws Throwable
{
String[] expected = new String[]
{
"testSomething4 :: Data set 1 / 3",
"testSomething4 :: Data set 3 / 3",
"testSomething5",
};
checkDescription(MixedSkipDataSetAnnotations.class, expected);
Result result = JUnitCore.runClasses(MixedSkipDataSetAnnotations.class);
checkPass(result, 3, 0);
}
}
4 changes: 4 additions & 0 deletions ...m/xceptance/neodymium/testclasses/data/override/classonly/ClassSkipDataSetAnnotations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
key1
val1
val2
val3
4 changes: 4 additions & 0 deletions ...xceptance/neodymium/testclasses/data/override/methodonly/MethodSkipDataSetAnnotations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
key1
val1
val2
val3
4 changes: 4 additions & 0 deletions ...s/com/xceptance/neodymium/testclasses/data/override/mixed/MixedSkipDataSetAnnotations.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
key1
val1
val2
val3