You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/19 23:21:52 UTC
[4/6] git commit: Removed commented out code with no function.
Removed commented out code with no function.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fe2b3d6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fe2b3d6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fe2b3d6b
Branch: refs/pull/76/merge
Commit: fe2b3d6b4e24b4fa07215e66a46da6ccf1d4b510
Parents: 7b94845
Author: grey <gr...@apigee.com>
Authored: Wed Mar 19 15:00:41 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Mar 19 15:00:41 2014 -0700
----------------------------------------------------------------------
.../cassandra/ManagementServiceIT.java | 26 +-------------------
1 file changed, 1 insertion(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/fe2b3d6b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
index 7860847..6c0431b 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ManagementServiceIT.java
@@ -772,7 +772,6 @@ public class ManagementServiceIT {
try {
f = new File( "testFileConnections.json" );
- //f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't then don't do anything and carry on.
@@ -844,7 +843,6 @@ public class ManagementServiceIT {
assertNotNull( objVibrations );
- //f.delete();
f.deleteOnExit();
}
@@ -856,7 +854,6 @@ public class ManagementServiceIT {
try {
f = new File( "testConnectionsOnApplicationEndpoint.json" );
- //f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't then don't do anything and carry on.
@@ -931,7 +928,6 @@ public class ManagementServiceIT {
assertNotNull( objVibrations );
- //f.delete();
f.deleteOnExit();
}
@@ -944,7 +940,6 @@ public class ManagementServiceIT {
try {
f = new File( "fileValidity.json" );
- //f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't then don't do anything and carry on.
@@ -981,7 +976,6 @@ public class ManagementServiceIT {
org.json.simple.JSONObject entityData = ( JSONObject ) entity.get( "Metadata" );
assertNotNull( entityData );
}
- //f.delete();
f.deleteOnExit();
}
@@ -993,7 +987,6 @@ public class ManagementServiceIT {
try {
f = new File( "testValidityOfApplicationExport.json" );
- //f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't then don't do anything and carry on.
@@ -1029,7 +1022,6 @@ public class ManagementServiceIT {
org.json.simple.JSONObject entityData = ( JSONObject ) entity.get( "Metadata" );
assertNotNull( entityData );
}
- //f.delete();
f.deleteOnExit();
}
@@ -1042,7 +1034,6 @@ public class ManagementServiceIT {
try {
f = new File( "exportOneOrg.json" );
- //f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't then don't do anything and carry on.
@@ -1085,7 +1076,6 @@ public class ManagementServiceIT {
// assertNotEquals( "NotEqual","junkRealName",entityName );
assertFalse( "junkRealName".equals( entityName ) );
}
- //f.delete();
f.deleteOnExit();
}
@@ -1100,7 +1090,6 @@ public class ManagementServiceIT {
try {
f = new File( "exportOneApp.json" );
- //f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't, don't do anything and carry on.
@@ -1155,8 +1144,6 @@ public class ManagementServiceIT {
assertFalse( "junkRealName".equals( entityName ) );
}
f.deleteOnExit();
-
- //f.delete();
}
//
@Test
@@ -1168,7 +1155,6 @@ public class ManagementServiceIT {
try {
f = new File( "exportOneApp.json" );
- // f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't, don't do anything and carry on.
@@ -1222,7 +1208,7 @@ public class ManagementServiceIT {
String entityName = ( String ) entityData.get( "name" );
assertFalse( "junkRealName".equals( entityName ) );
}
- //f.delete();
+
f.deleteOnExit();
}
@@ -1235,7 +1221,6 @@ public class ManagementServiceIT {
try {
f = new File( "exportOneCollection.json" );
- // f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't, don't do anything and carry on.
@@ -1282,7 +1267,6 @@ public class ManagementServiceIT {
org.json.simple.JSONArray a = ( org.json.simple.JSONArray ) parser.parse( new FileReader( f ) );
assertEquals( entitiesToCreate , a.size() );
- //f.delete();
f.deleteOnExit();
}
@@ -1298,7 +1282,6 @@ public class ManagementServiceIT {
try {
f = new File( "exportOneOrganization.json" );
- // f.delete();
}
catch ( Exception e ) {
//consumed because this checks to see if the file exists. If it doesn't, don't do anything and carry on.
@@ -1370,9 +1353,6 @@ public class ManagementServiceIT {
/*plus 3 for the default roles*/
assertEquals( 23 , a.size() );
f.deleteOnExit();
-
-
- //f.delete();
}
@Test
@@ -1594,10 +1574,6 @@ public class ManagementServiceIT {
HashMap<String, Object> payload = new HashMap<String, Object>();
Map<String, Object> properties = new HashMap<String, Object>();
Map<String, Object> storage_info = new HashMap<String, Object>();
- // TODO: always put dummy values here and ignore this test.
-// storage_info.put( "s3_key", "insert key here" );
-// storage_info.put( "s3_access_id", "insert access id here" );
-// storage_info.put( "bucket_location", "insert bucket name here" );
storage_info.put( "s3_key", System.getProperty( "secretKey" ) );
storage_info.put( "s3_access_id", System.getProperty( "accessKey" ));
storage_info.put( "bucket_location", System.getProperty( "bucketName" ) );