Subversion Repositories DevTools

Rev

Rev 7201 | Rev 7231 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7201 Rev 7210
Line 1195... Line 1195...
1195
		}
1195
		}
1196
 
1196
 
1197
		checkBuildFile(tName);
1197
		checkBuildFile(tName);
1198
	}
1198
	}
1199
	
1199
	
1200
	   /**
1200
	/**
1201
     *  Create two sets of packages
1201
     *  Create two sets of packages
1202
     *  The first will be a WIP
1202
     *  The first will be a WIP
1203
     *  
1203
     *  
1204
     *  The second will contain a Ripple and a WIP
1204
     *  The second will contain a Ripple and a WIP
1205
     *  
1205
     *  
Line 1271... Line 1271...
1271
 
1271
 
1272
            rippleEngine.planRelease(false);
1272
            rippleEngine.planRelease(false);
1273
        }
1273
        }
1274
        catch (Exception e)
1274
        catch (Exception e)
1275
        {
1275
        {
-
 
1276
        }
-
 
1277
 
-
 
1278
        checkBuildFile(tName);
-
 
1279
    }
-
 
1280
    
-
 
1281
    /**
-
 
1282
     *  Create one sets of packages
-
 
1283
     *  Configure such that a WIP and a natural ripple exist on the same package
-
 
1284
     *  
-
 
1285
     *  Ensure that the WIP is processed 
-
 
1286
     */
-
 
1287
    @Test
-
 
1288
    public void RippleTest_18()
-
 
1289
    {
-
 
1290
        String tName = "ripple18";
-
 
1291
        mLogger.debug("RippleTest {}", tName);
-
 
1292
        System.out.println("RippleTest " + tName);
-
 
1293
        releaseManager = new myReleaseManager(tName, "not used", "not used");
-
 
1294
        rippleEngine = new RippleEngine(releaseManager, 11111, true);
-
 
1295
 
-
 
1296
        try
-
 
1297
        {
-
 
1298
            rippleEngine.collectMetaData();
-
 
1299
            
-
 
1300
            /*    A basic set of packages
-
 
1301
             */
-
 
1302
            Package  p1 = createPackage(1, "p1");
-
 
1303
            Package  p2 = createPackage(2, "p2");
-
 
1304
            Package  p3 = createPackage(3, "p3");
-
 
1305
            Package  p4 = createPackage(4, "p4");
-
 
1306
            Package  p5 = createPackage(5, "p5");
-
 
1307
            Package  p6 = createPackage(6, "p6");
-
 
1308
 
-
 
1309
            testPackageCollection.add(p1);
-
 
1310
            testPackageCollection.add(p2);
-
 
1311
            testPackageCollection.add(p3);
-
 
1312
            testPackageCollection.add(p4);
-
 
1313
            testPackageCollection.add(p5);
-
 
1314
            testPackageCollection.add(p6);
-
 
1315
 
-
 
1316
            p2.addDependency(p1);
-
 
1317
            p3.addDependency(p2);
-
 
1318
            p4.addDependency(p3);
-
 
1319
            p5.addDependency(p4);
-
 
1320
            p6.addDependency(p5);
-
 
1321
            
-
 
1322
            ripplePackage("p1.cr");                 // Mark p1 as having been built. thus p2 will need to be rippled.
-
 
1323
            createWip(9999, "p2.cr");               // Also have a WIP on p2
-
 
1324
 
-
 
1325
 
-
 
1326
            rippleEngine.planRelease(false);
-
 
1327
        }
-
 
1328
        catch (Exception e)
-
 
1329
        {
-
 
1330
        }
-
 
1331
 
-
 
1332
        checkBuildFile(tName);
-
 
1333
    }
-
 
1334
    
-
 
1335
    /**
-
 
1336
     *  Create one sets of packages
-
 
1337
     *  Configure with  WIP and a NaturalRipple such that we will have a basicPlan followed by a modified full plan
-
 
1338
     *  
-
 
1339
     *  Ensure the the dependency version numbers are that of the WIP which will part of the follow-on plan 
-
 
1340
     */
-
 
1341
    @Test
-
 
1342
    public void RippleTest_19()
-
 
1343
    {
-
 
1344
        String tName = "ripple19";
-
 
1345
        mLogger.debug("RippleTest {}", tName);
-
 
1346
        System.out.println("RippleTest " + tName);
-
 
1347
        releaseManager = new myReleaseManager(tName, "not used", "not used");
-
 
1348
        rippleEngine = new RippleEngine(releaseManager, 11111, true);
-
 
1349
 
-
 
1350
        try
-
 
1351
        {
-
 
1352
            rippleEngine.collectMetaData();
-
 
1353
            
-
 
1354
            /*    A basic set of packages
-
 
1355
             */
-
 
1356
            Package  p1 = createPackage(1, "p1");
-
 
1357
            Package  p2 = createPackage(2, "p2");
-
 
1358
            Package  p3 = createPackage(3, "p3");
-
 
1359
            Package  p4 = createPackage(4, "p4");
-
 
1360
            Package  p5 = createPackage(5, "p5");
-
 
1361
            Package  p6 = createPackage(6, "p6");
-
 
1362
 
-
 
1363
            testPackageCollection.add(p1);
-
 
1364
            testPackageCollection.add(p2);
-
 
1365
            testPackageCollection.add(p3);
-
 
1366
            testPackageCollection.add(p4);
-
 
1367
            testPackageCollection.add(p5);
-
 
1368
            testPackageCollection.add(p6);
-
 
1369
 
-
 
1370
            p2.addDependency(p1);
-
 
1371
            p3.addDependency(p2);
-
 
1372
            p4.addDependency(p3);
-
 
1373
            p5.addDependency(p4);
-
 
1374
            p6.addDependency(p5);
-
 
1375
            
-
 
1376
            ripplePackage("p2.cr");                             // Mark p2 as having been built. thus p3 will need to be rippled.
-
 
1377
            Package pwip = createWip(9999, "p1.cr");            // Also have a WIP on p1
-
 
1378
            pwip.mVersion = "22.22.22";
-
 
1379
            pwip.mNextVersion = "33.33.33";
-
 
1380
 
-
 
1381
            rippleEngine.planRelease(false);
-
 
1382
        }
-
 
1383
        catch (Exception e)
-
 
1384
        {
1276
        }
1385
        }
1277
 
1386
 
1278
        checkBuildFile(tName);
1387
        checkBuildFile(tName);
1279
    }  
1388
    }  
1280
 
1389