diff --git a/spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/SharedVariableAtomicityDetectorTest.java b/spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/SharedVariableAtomicityDetectorTest.java index 468ce445f3b..24f67871107 100644 --- a/spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/SharedVariableAtomicityDetectorTest.java +++ b/spotbugs-tests/src/test/java/edu/umd/cs/findbugs/detect/SharedVariableAtomicityDetectorTest.java @@ -139,7 +139,7 @@ void noBugSynchronizedBlockPrimitiveSeparateMethod() { @Test void noBugCompoundOpOnAtomicVariable() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundOperationOnSharedAtomicVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundOperationOnSharedAtomicVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 0); @@ -147,7 +147,7 @@ void noBugCompoundOpOnAtomicVariable() { @Test void noBugCompoundOperationVolatileReadSyncWrite() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileReadSyncWrite.class"); + performAnalysis("multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileReadSyncWrite.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 0); @@ -155,7 +155,7 @@ void noBugCompoundOperationVolatileReadSyncWrite() { @Test void noBugCompoundOperationReadWriteLock() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundNegateReadWriteLock.class"); + performAnalysis("multithreaded/compoundoperation/CompoundNegateReadWriteLock.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 0); @@ -163,7 +163,7 @@ void noBugCompoundOperationReadWriteLock() { @Test void noBugCompoundOperationOnNotSharedVariable() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundDivisionOnVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 0); @@ -171,7 +171,7 @@ void noBugCompoundOperationOnNotSharedVariable() { @Test void noBugCompoundOperationInSynchronizedBlock() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/SynchronizedBlockCompoundOperationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/SynchronizedBlockCompoundOperationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 0); @@ -179,7 +179,7 @@ void noBugCompoundOperationInSynchronizedBlock() { @Test void noBugCompoundOperationInSynchronizedMethod() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/SynchronizedMethodCompoundOperationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/SynchronizedMethodCompoundOperationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 0); @@ -188,7 +188,7 @@ void noBugCompoundOperationInSynchronizedMethod() { // --num @Test void bugForCompoundPreDecrementation() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundPreDecrementationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundPreDecrementationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -198,7 +198,7 @@ void bugForCompoundPreDecrementation() { // num-- @Test void bugForCompoundPostDecrementation() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundPostDecrementationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundPostDecrementationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -208,7 +208,7 @@ void bugForCompoundPostDecrementation() { // ++num @Test void bugForCompoundPreIncrementation() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundPreIncrementationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundPreIncrementationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -219,7 +219,7 @@ void bugForCompoundPreIncrementation() { @Test void bugForCompoundPostIncrementation() { // The order of the functions is reversed - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundPostIncrementationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundPostIncrementationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -230,7 +230,7 @@ void bugForCompoundPostIncrementation() { @Test void bugForCompoundIAND() { // considered multithreaded because it has a volatile field (not the problematic) - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundIANDOperationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundIANDOperationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -241,7 +241,7 @@ void bugForCompoundIAND() { @Test void bugForCompoundIOR() { // considered multithreaded because it has a field (not the problematic) from the java.util.concurrent.atomic package - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundIOROperationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundIOROperationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -252,7 +252,7 @@ void bugForCompoundIOR() { @Test void bugForCompoundLogicalRightShift() { // considered multithreaded because it extends Thread - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundLogicalRightShiftingOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundLogicalRightShiftingOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -263,7 +263,7 @@ void bugForCompoundLogicalRightShift() { @Test void bugForCompoundRightShift() { // considered multithreaded because it has a method with synchronized block - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundRightShiftingOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundRightShiftingOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -274,7 +274,7 @@ void bugForCompoundRightShift() { @Test void bugForCompoundLeftShift() { // considered multithreaded because it has synchronized method - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundLeftShiftingOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundLeftShiftingOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -285,7 +285,7 @@ void bugForCompoundLeftShift() { @Test void bugForCompoundModulo() { // considered multithreaded because it implements Runnable - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundModuloOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundModuloOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -295,7 +295,7 @@ void bugForCompoundModulo() { // *= @Test void bugForCompoundMultiplication() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundMultiplicationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundMultiplicationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -305,7 +305,7 @@ void bugForCompoundMultiplication() { // /= @Test void bugForCompoundDivision() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundDivisionOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -315,7 +315,7 @@ void bugForCompoundDivision() { // -= @Test void bugForCompoundSubtraction() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundSubtractionOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundSubtractionOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -327,7 +327,7 @@ void bugForCompoundSubtraction() { @Test void bugForCompoundAdditionOnVolatileVar() { // simply defining the field as volatile is not enough - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -338,7 +338,7 @@ void bugForCompoundAdditionOnVolatileVar() { @Test void bugForCompoundXOR() { // considered multithreaded because it has a field (not the problematic) with synchronized assignment - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundXOROperationOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundXOROperationOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -348,7 +348,7 @@ void bugForCompoundXOR() { // num = num + 2 @Test void bugForSimpleAdditionDependingOnPrevValue() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/AdditionOnSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/AdditionOnSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -358,7 +358,7 @@ void bugForSimpleAdditionDependingOnPrevValue() { // num = -num @Test void bugForNegateDependingOnPrevValue() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/NegateSharedVariable.class"); + performAnalysis("multithreaded/compoundoperation/NegateSharedVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -368,7 +368,7 @@ void bugForNegateDependingOnPrevValue() { // num -= num + 2 @Test void bugForCompoundSubtractionComplex() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundSubstractComplexExpression.class"); + performAnalysis("multithreaded/compoundoperation/CompoundSubstractComplexExpression.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -378,7 +378,7 @@ void bugForCompoundSubtractionComplex() { // num += num2 + 5 @Test void bugForCompoundAdditionComplexWithAnotherVar() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundAdditionComplexExpressionWithAnotherVar.class"); + performAnalysis("multithreaded/compoundoperation/CompoundAdditionComplexExpressionWithAnotherVar.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -388,7 +388,7 @@ void bugForCompoundAdditionComplexWithAnotherVar() { // num2 = num; num += 1 @Test void bugForCompoundAdditionWithAnotherVar() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundAdditionWithAnotherVar.class"); + performAnalysis("multithreaded/compoundoperation/CompoundAdditionWithAnotherVar.class"); assertBugTypeCount(PRIMITIVE_BUG, 1); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -399,7 +399,7 @@ void bugForCompoundAdditionWithAnotherVar() { // num += param @Test void bugForCompoundSubstractionOfArg() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfArg.class"); + performAnalysis("multithreaded/compoundoperation/CompoundSubstractionOfArg.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -409,7 +409,7 @@ void bugForCompoundSubstractionOfArg() { // num += getOne() @Test void bugForCompoundSubstractionOfFunCall() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfMethodReturnValue.class"); + performAnalysis("multithreaded/compoundoperation/CompoundSubstractionOfMethodReturnValue.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 1); @@ -418,7 +418,7 @@ void bugForCompoundSubstractionOfFunCall() { @Test void bugForTwoCompoundOperations() { - performAnalysis("multithreaded/compoundOperationOnSharedVariables/CompoundDivideMultiplyOnVariable.class"); + performAnalysis("multithreaded/compoundoperation/CompoundDivideMultiplyOnVariable.class"); assertBugTypeCount(PRIMITIVE_BUG, 0); assertBugTypeCount(WRITE_64BIT_BUG, 0); assertBugTypeCount(OPS_BUG, 2); diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/AdditionOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/AdditionOnSharedVariable.java similarity index 77% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/AdditionOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/AdditionOnSharedVariable.java index 889eb071e56..d4d74277518 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/AdditionOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/AdditionOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class AdditionOnSharedVariable extends Thread { private int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionComplexExpressionWithAnotherVar.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionComplexExpressionWithAnotherVar.java similarity index 84% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionComplexExpressionWithAnotherVar.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionComplexExpressionWithAnotherVar.java index 53159165abc..01d48d93715 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionComplexExpressionWithAnotherVar.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionComplexExpressionWithAnotherVar.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundAdditionComplexExpressionWithAnotherVar extends Thread { private int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileReadSyncWrite.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileReadSyncWrite.java similarity index 80% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileReadSyncWrite.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileReadSyncWrite.java index b43e2416f8e..53ea8f6bdb6 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileReadSyncWrite.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileReadSyncWrite.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundAdditionOnSharedVolatileReadSyncWrite extends Thread { private volatile int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileVariable.java index d464987eded..c0f793f1df0 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionOnSharedVolatileVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionOnSharedVolatileVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundAdditionOnSharedVolatileVariable extends Thread { private volatile int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionWithAnotherVar.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionWithAnotherVar.java similarity index 83% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionWithAnotherVar.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionWithAnotherVar.java index b6eb6e69fa3..53baf05687f 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundAdditionWithAnotherVar.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundAdditionWithAnotherVar.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundAdditionWithAnotherVar extends Thread { private int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivideMultiplyOnVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivideMultiplyOnVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivideMultiplyOnVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivideMultiplyOnVariable.java index c664192d6ec..34092294b57 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivideMultiplyOnVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivideMultiplyOnVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundDivideMultiplyOnVariable extends Thread { private double num = 3.0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivisionOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivisionOnSharedVariable.java index 4f3c3ad1651..521fbed2a01 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivisionOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundDivisionOnSharedVariable extends Thread { private double num = 3.0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivisionOnVariable.java similarity index 71% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivisionOnVariable.java index 06706677bb1..b3b2a0a734c 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundDivisionOnVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundDivisionOnVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundDivisionOnVariable extends Thread { private double num = 3.0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundIANDOperationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundIANDOperationOnSharedVariable.java similarity index 82% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundIANDOperationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundIANDOperationOnSharedVariable.java index 59ed4614170..70e31ad74c9 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundIANDOperationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundIANDOperationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundIANDOperationOnSharedVariable { private int num = 1; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundIOROperationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundIOROperationOnSharedVariable.java similarity index 84% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundIOROperationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundIOROperationOnSharedVariable.java index ce511e9e587..174af4eed77 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundIOROperationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundIOROperationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundLeftShiftingOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundLeftShiftingOnSharedVariable.java similarity index 82% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundLeftShiftingOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundLeftShiftingOnSharedVariable.java index 20895144e63..0198ae24001 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundLeftShiftingOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundLeftShiftingOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundLeftShiftingOnSharedVariable { private int num = 1; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundLogicalRightShiftingOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundLogicalRightShiftingOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundLogicalRightShiftingOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundLogicalRightShiftingOnSharedVariable.java index 8b1c747a24f..18f2abc02fe 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundLogicalRightShiftingOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundLogicalRightShiftingOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundLogicalRightShiftingOnSharedVariable extends Thread { private int num = 1; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundModuloOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundModuloOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundModuloOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundModuloOnSharedVariable.java index 8b8cad84360..25fb3035a53 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundModuloOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundModuloOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundModuloOnSharedVariable implements Runnable { private Integer num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundMultiplicationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundMultiplicationOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundMultiplicationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundMultiplicationOnSharedVariable.java index b52d3ab3c52..b936efa05a7 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundMultiplicationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundMultiplicationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundMultiplicationOnSharedVariable extends Thread { private Integer num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundNegateReadWriteLock.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundNegateReadWriteLock.java similarity index 92% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundNegateReadWriteLock.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundNegateReadWriteLock.java index b17dce1a43e..e0388be6c64 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundNegateReadWriteLock.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundNegateReadWriteLock.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundOperationOnSharedAtomicVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundOperationOnSharedAtomicVariable.java similarity index 84% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundOperationOnSharedAtomicVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundOperationOnSharedAtomicVariable.java index 95374cdd07f..c61f036dbaf 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundOperationOnSharedAtomicVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundOperationOnSharedAtomicVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPostDecrementationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPostDecrementationOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPostDecrementationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPostDecrementationOnSharedVariable.java index 108a0e69bd9..4bd24915f38 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPostDecrementationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPostDecrementationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundPostDecrementationOnSharedVariable extends Thread { private double num = 3.0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPostIncrementationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPostIncrementationOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPostIncrementationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPostIncrementationOnSharedVariable.java index e46bf5894d8..d02dbd6ccd0 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPostIncrementationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPostIncrementationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundPostIncrementationOnSharedVariable extends Thread { private double num = 3.0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPreDecrementationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPreDecrementationOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPreDecrementationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPreDecrementationOnSharedVariable.java index dd135c5e608..451cd887557 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPreDecrementationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPreDecrementationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundPreDecrementationOnSharedVariable extends Thread { private double num = 3.0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPreIncrementationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPreIncrementationOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPreIncrementationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPreIncrementationOnSharedVariable.java index d7ec8952429..ec5855872b0 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundPreIncrementationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundPreIncrementationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundPreIncrementationOnSharedVariable extends Thread { private double num = 3.0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundRightShiftingOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundRightShiftingOnSharedVariable.java similarity index 85% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundRightShiftingOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundRightShiftingOnSharedVariable.java index c034cd55f3e..582008f53e3 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundRightShiftingOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundRightShiftingOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundRightShiftingOnSharedVariable { private int num = 1; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractComplexExpression.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractComplexExpression.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractComplexExpression.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractComplexExpression.java index df9bda94c96..26aa759b036 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractComplexExpression.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractComplexExpression.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundSubstractComplexExpression extends Thread { private int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfArg.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractionOfArg.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfArg.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractionOfArg.java index ab1fe839830..3b8cfaf118e 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfArg.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractionOfArg.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundSubstractionOfArg extends Thread { private int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfMethodReturnValue.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractionOfMethodReturnValue.java similarity index 82% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfMethodReturnValue.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractionOfMethodReturnValue.java index 08988aa42a8..86023079302 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubstractionOfMethodReturnValue.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubstractionOfMethodReturnValue.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundSubstractionOfMethodReturnValue extends Thread { private int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubtractionOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubtractionOnSharedVariable.java similarity index 78% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubtractionOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubtractionOnSharedVariable.java index 28260eecc3f..f8d3d94ba0f 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundSubtractionOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundSubtractionOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class CompoundSubtractionOnSharedVariable extends Thread { private Integer num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundXOROperationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundXOROperationOnSharedVariable.java similarity index 87% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundXOROperationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundXOROperationOnSharedVariable.java index b0f7ad56b5e..bb7640f3efe 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/CompoundXOROperationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/CompoundXOROperationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; import java.util.ArrayList; import java.util.Collections; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/NegateSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/NegateSharedVariable.java similarity index 76% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/NegateSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/NegateSharedVariable.java index 4ac4fff3bad..101aaaccbc0 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/NegateSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/NegateSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class NegateSharedVariable extends Thread { private int num = 3; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/SynchronizedBlockCompoundOperationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/SynchronizedBlockCompoundOperationOnSharedVariable.java similarity index 84% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/SynchronizedBlockCompoundOperationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/SynchronizedBlockCompoundOperationOnSharedVariable.java index ef1557a6877..c47628377b6 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/SynchronizedBlockCompoundOperationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/SynchronizedBlockCompoundOperationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class SynchronizedBlockCompoundOperationOnSharedVariable extends Thread { private int num = 0; diff --git a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/SynchronizedMethodCompoundOperationOnSharedVariable.java b/spotbugsTestCases/src/java/multithreaded/compoundoperation/SynchronizedMethodCompoundOperationOnSharedVariable.java similarity index 81% rename from spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/SynchronizedMethodCompoundOperationOnSharedVariable.java rename to spotbugsTestCases/src/java/multithreaded/compoundoperation/SynchronizedMethodCompoundOperationOnSharedVariable.java index 2412d345bf3..d4683ed571b 100644 --- a/spotbugsTestCases/src/java/multithreaded/compoundOperationOnSharedVariables/SynchronizedMethodCompoundOperationOnSharedVariable.java +++ b/spotbugsTestCases/src/java/multithreaded/compoundoperation/SynchronizedMethodCompoundOperationOnSharedVariable.java @@ -1,4 +1,4 @@ -package multithreaded.compoundOperationOnSharedVariables; +package multithreaded.compoundoperation; public class SynchronizedMethodCompoundOperationOnSharedVariable extends Thread { private boolean flag = true;