Project

General

Profile

« Previous | Next » 

Revision 6208

merge 1.9.5 changes to trunk (delete now preserves access rules and docs can be read after deletion)

View differences:

test/edu/ucsb/nceas/metacattest/InlineDataAccessTest.java
482 482
			Thread.sleep(10000);
483 483

  
484 484
			deleteDocid(newdocid + ".4", SUCCESS, false);
485
			readDocidWhichEqualsDoc(newdocid + ".4", testdocument, FAILURE, false);
485
			readDocidWhichEqualsDoc(newdocid + ".4", testdocument, SUCCESS, false);
486 486
			m.logout();
487 487
		} catch (MetacatAuthException mae) {
488 488
			fail("Authorization failed:\n" + mae.getMessage());
......
552 552
			Thread.sleep(10000);
553 553

  
554 554
			deleteDocid(newdocid + ".4", SUCCESS, false);
555
			readDocidWhichEqualsDoc(newdocid + ".4", testdocument, FAILURE, false);
555
			readDocidWhichEqualsDoc(newdocid + ".4", testdocument, SUCCESS, false);
556 556
			m.logout();
557 557
		} catch (MetacatAuthException mae) {
558 558
			fail("Authorization failed:\n" + mae.getMessage());
......
1118 1118

  
1119 1119
			// delete the document
1120 1120
			m.login(username, password);
1121
			 try
1122
	      {
1123
	        Thread.sleep(5000);
1124
	      }
1125
	      catch(Exception e)
1126
	      {
1127
	        
1128
	      }
1121 1129
			deleteDocid(newdocid + ".1", SUCCESS, false);
1122 1130
			m.logout();
1123 1131

  
......
1163 1171

  
1164 1172
			// delete the document
1165 1173
			m.login(username, password);
1174
			try
1175
			{
1176
			  Thread.sleep(5000);
1177
			}
1178
			catch(Exception e)
1179
			{
1180
			  
1181
			}
1166 1182
			deleteDocid(newdocid + ".1", SUCCESS, false);
1167 1183
			m.logout();
1168 1184

  
......
1208 1224

  
1209 1225
			// delete the document
1210 1226
			m.login(username, password);
1227
			try
1228
      {
1229
        Thread.sleep(5000);
1230
      }
1231
      catch(Exception e)
1232
      {
1233
        
1234
      }
1211 1235
			deleteDocid(newdocid + ".1", SUCCESS, false);
1212 1236
			m.logout();
1213 1237

  
......
1254 1278

  
1255 1279
			// delete the document
1256 1280
			m.login(username, password);
1281
			try
1282
      {
1283
        Thread.sleep(5000);
1284
      }
1285
      catch(Exception e)
1286
      {
1287
        
1288
      }
1257 1289
			deleteDocid(newdocid + ".1", SUCCESS, false);
1258 1290
			m.logout();
1259 1291

  
......
1413 1445

  
1414 1446
			// delete the document
1415 1447
			m.login(username, password);
1448
			try
1449
      {
1450
        Thread.sleep(5000);
1451
      }
1452
      catch(Exception e)
1453
      {
1454
        
1455
      }
1416 1456
			deleteDocid(newdocid + ".1", SUCCESS, false);
1417 1457
			m.logout();
1418 1458

  
......
1459 1499

  
1460 1500
			// delete the document
1461 1501
			m.login(username, password);
1502
			try
1503
      {
1504
        Thread.sleep(5000);
1505
      }
1506
      catch(Exception e)
1507
      {
1508
        
1509
      }
1462 1510
			deleteDocid(newdocid + ".1", SUCCESS, false);
1463 1511
			m.logout();
1464 1512

  

Also available in: Unified diff