Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmanuel Graf2011-02-21 08:43:33 -0500
committerEmanuel Graf2011-02-21 08:43:33 -0500
commit496551af98fc293ada93b435eec3758acc5bb26f (patch)
tree8a22839a7700d51a8a9924c2bd2370c640e59cb1 /core/org.eclipse.cdt.ui.tests
parent8d45a913ca3be63e7e57c1d4b4e6fe1d5e1bd84b (diff)
downloadorg.eclipse.cdt-496551af98fc293ada93b435eec3758acc5bb26f.tar.gz
org.eclipse.cdt-496551af98fc293ada93b435eec3758acc5bb26f.tar.xz
org.eclipse.cdt-496551af98fc293ada93b435eec3758acc5bb26f.zip
Bug 337714: Fixed streamline ChangeGenerator
https://bugs.eclipse.org/bugs/show_bug.cgi?id=337714
Diffstat (limited to 'core/org.eclipse.cdt.ui.tests')
-rw-r--r--core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethod.rts3
-rw-r--r--core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethodHistory.rts2
-rw-r--r--core/org.eclipse.cdt.ui.tests/resources/refactoring/GenerateGettersAndSetters.rts29
-rw-r--r--core/org.eclipse.cdt.ui.tests/resources/refactoring/HideMethod.rts11
-rw-r--r--core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts9
5 files changed, 26 insertions, 28 deletions
diff --git a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethod.rts b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethod.rts
index f0c4e27b71..b0d7a551ca 100644
--- a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethod.rts
+++ b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethod.rts
@@ -236,7 +236,7 @@ int main(){
int i;
exp(i);
- return i;
+ return i;
}
//@.config
@@ -2590,6 +2590,7 @@ void exp()
int main(int argc, char **argv) {
exp();
+
}
//!Bug#264712 Refactor extract function deletes comments in header
diff --git a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethodHistory.rts b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethodHistory.rts
index 218bbba9cc..0077bd9134 100644
--- a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethodHistory.rts
+++ b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ExtractMethodHistory.rts
@@ -250,7 +250,7 @@ int main(){
int i;
exp(i);
- return i;
+ return i;
}
//@refScript.xml
diff --git a/core/org.eclipse.cdt.ui.tests/resources/refactoring/GenerateGettersAndSetters.rts b/core/org.eclipse.cdt.ui.tests/resources/refactoring/GenerateGettersAndSetters.rts
index 1ef8de22f3..218ba95eb6 100644
--- a/core/org.eclipse.cdt.ui.tests/resources/refactoring/GenerateGettersAndSetters.rts
+++ b/core/org.eclipse.cdt.ui.tests/resources/refactoring/GenerateGettersAndSetters.rts
@@ -99,8 +99,8 @@ public:
{
return name;
}
-
- int getSystemId(){
+
+ int getSystemId(){
return systemId;
}
@@ -217,8 +217,8 @@ namespace Personal {
{
return name;
}
-
- int getSystemId(){
+
+ int getSystemId(){
return systemId;
}
@@ -334,8 +334,8 @@ public:
{
this->name = name;
}
-
- int getSystemId(){
+
+ int getSystemId(){
return systemId;
}
@@ -456,8 +456,8 @@ public:
{
this->name = name;
}
-
- int getSystemId(){
+
+ int getSystemId(){
return systemId;
}
@@ -568,7 +568,8 @@ public:
this->systemId = systemId;
}
- Person(int socSecNo); // contructor
+
+ Person(int socSecNo); // contructor
~Person(); // destructor
@@ -691,7 +692,6 @@ public:
{
this->id = id;
}
-
};
#endif /*C_H_*/
@@ -744,8 +744,7 @@ public:
{
this->i = i;
}
-
- //comment3
+ //comment3
};
#endif /* TEST_H_ */
@@ -934,7 +933,7 @@ namespace Personal {
return name;
}
- int Person::SocSecNo() {
+int Person::SocSecNo() {
return socSecNo;
}
@@ -1473,8 +1472,8 @@ namespace foo
{
this->testField = testField;
}
-
- void Test::foo()
+
+ void Test::foo()
{
}
diff --git a/core/org.eclipse.cdt.ui.tests/resources/refactoring/HideMethod.rts b/core/org.eclipse.cdt.ui.tests/resources/refactoring/HideMethod.rts
index 7c97e8afbf..a7633a3ad2 100644
--- a/core/org.eclipse.cdt.ui.tests/resources/refactoring/HideMethod.rts
+++ b/core/org.eclipse.cdt.ui.tests/resources/refactoring/HideMethod.rts
@@ -850,6 +850,7 @@ public:
private:
void methode2();
+
};
#endif /* HIDEMETHOD_H_ */
@@ -1219,7 +1220,7 @@ struct A{
struct A{
private:
- void method2();
+ void method2();
};
#endif /*A_H_*/
@@ -1263,7 +1264,7 @@ public:
private:
void set(bool b)
{
- }
+ }
};
//!HideMethod CheckIfPrivateBug 2
@@ -1305,7 +1306,7 @@ public:
private:
void set(bool b)
{
- }
+ }
};
//!HideMethod CheckIfPrivateBug 3
@@ -1334,7 +1335,7 @@ public:
struct other
{
private:
- bool value() {return true;}
+ bool value() {return true;}
};
class Klass
@@ -1381,7 +1382,7 @@ public:
void set(bool b){}
private:
- void test()
+ void test()
{
other o;
this->set(o.value());
diff --git a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts
index 893f5d31ca..ad0fb7421e 100644
--- a/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts
+++ b/core/org.eclipse.cdt.ui.tests/resources/refactoring/ImplementMethod.rts
@@ -221,8 +221,7 @@ namespace NameSpace
}
void ClassInNamespace::test2()
- {
- }
+ {}
}
//!virtual method in the middle of con/destructor, without parameters and void return value
//#org.eclipse.cdt.ui.tests.refactoring.implementmethod.ImplementMethodRefactoringTest
@@ -542,8 +541,7 @@ namespace OuterSpace {
}
int NameSpace::test2()
- {
- }
+ {}
}
//!implement function within namespaces
//#org.eclipse.cdt.ui.tests.refactoring.implementmethod.ImplementMethodRefactoringTest
@@ -576,8 +574,7 @@ namespace OuterSpace {
}
int test2()
- {
- }
+ {}
}
}
//!class template member functions with multiple templates

Back to the top